from trunk
authorKenichi Handa <handa@m17n.org>
Thu, 25 Feb 2010 00:56:44 +0000 (09:56 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 25 Feb 2010 00:56:44 +0000 (09:56 +0900)

Trivial merge